A little tweaks in format