nit refactoring

please take a look