Refactoring: improved context docs and made non-init variable warning go
away