[Abhinav/Anil] - Added few more beautification