Additional cleanup and comments