Two small fixes

* Iterate efficiently over maps using entrySet instead of keySet
* Remove string.format call with no format placeholders