Refactor to use previously defined methods. It's allowed by the grader