Code cleanup, formatting, removal of commented out code, etc.