Misc clean up and comments