more clean up, drafting