More cleanup
Make Context instance variable private
More cleaning
Add Trevor Bernard to contributors