Develop

Joe - take a look - none of these should be functional changes, just some code cleanup and some comments.