clean(*): refactor, rename & cleanup