Break methods and remove duplication in helpers