cleanup and comments update