some cleanup and removal of comments