Removing JSON instances for Map
Removing extraneous exposed type parentheses