Cleaning up comments and removing debug code