Refactor for the Garretty one

He cries if I don't do it.