Skip to content

Cleanup code

Cleanup code #2