Clean up more comments