Some minor tweaks in formating