Skip to content

Finalize refactor

Finalize refactor #604