Skip to content

Further refactoring

Further refactoring #8