More tweaks of format