clean up indentation and spacing