Skip to content

Cleanup codebase

Cleanup codebase #156