Cleanup

The Great cleanup for new code conventions. Enjoy!