Skip to content

Minor refactoring

Minor refactoring #560