Tidy formatting a bit