Skip to content

Fix/clean some code