first draft
first draft cleanup