Refactor More