Refactor Methods