Cleaning up comments and debug statements