Cleaning up, some drafting