removed nesting of maps