Skip to content

Cleanup internals

Cleanup internals #235