Refactor out "Context" argument