Made some more changes for formatting better its appearance