Refactor: Breaking out class