Clean up; more drafting