Minor improvements to formating