continued refactoring...