minor refactoring (make better use of newly refactored helper methods)