Clean up comments