cleaned up some context