Fixed comma positions in all headers, more consistency in format