Skip to content

Refactoring a bit

Refactoring a bit #318