clean up and indent