refactor(all): simplify all the stuff