Clean up comments further