various cleanup and comments