Skip to content

some refactoring

some refactoring #582