scrub code, comments, add TODOs