source: finished cleanup, basic refactor