Code Cleaning. Mostly momnop's NON-IDE work :P