Skip to content

Manual refactoring

Manual refactoring #42