cleanup, rough draft complete