refactor ftw
cleanup done