Clean up comments and code