Style, Refactor, onward