[IMP]Improved code as par coding conventions.