Skip to content

Cleanup and comment code