Development

fixed coding standard & other fixes described in the each commit.