Clean refactor pass...with no tests