Refactoring to take advantage of methods within the question.