additional cleanup and comments