Skip to content

Partial refactoring

Partial refactoring #2