minor refactoring, no functionality changes