cleanup and comments

exactly