Successful refactor