Made some changes for printing format