Attempt further method refactor