Skip to content

Finish refactoring

Finish refactoring #31