draft 1 some cleanup