Small context refactor