Removed another obsolete context variable
Streamlined formatting
Small optimizations