Refactor

Maybe clearer name?