Cleaning up spacing and indents