[refac] Context cleaned up