[Abhinav/Anil] - First cut for the beautification