Refactoring the way gets work