Minor fixes in format