refactoring previously-missed method calls