Removed un-needed context.
More context clean-up.
Better spacing..
Pushing to match VM.