Clean up on comments