Clean up commments