Tweaks
Added configuration
Cleanup, indented
Added context