Comments : update and cleanup