Skip to content

Some refactoring

Some refactoring #1033