minor tweaks & refactorings