Fixing some style issues and typos
Adding MetadataMap obj
Addressing other Qiitas' comments