cosmetics

syntax&code improvement,
reduced use of ObjectForKey for [ ] notation instead