some more clean up and formatting.