[IMP]Improved some code as per coding convention.