clean up; refactoring; removing deps