clean up and formatting