cleanup and comments