refactor(*): cleaning things up