cleanup and comments after final review