Refactor; Refactor; Refactor;