refactoring: method names, multi value returns