clean up and indent
clean up