refactor(*): cleanup