Remove extera space and indenting, #2517