Skip to content

Basic refactoring

Basic refactoring #36