Clean up based on comments