Clean up Comments