minor refactors. :angel: