Refactor for perfection