Named properly and isolate contexts
Cleaned up code