Cleanup
Cleanup, remove random nametype injection
Cleanup whitespace

No mixing spaces with tabs, no trailing whitespace.

Also removed some comments.