refactoring: just a couple more tweaks