Tidy up the context API