Comments, comments and some clean up