Cleanup and comments, WORKING
Cleanup and comments, WORKING