more refactoring, specifically around method signatures