removing instance of old style string format.

also added context dict in some cases. general clean up