Refactors to use helper methods