Moved Context and Service variables into methods, rather than created as class variables.