cleaning up comments and code