Coding guideline fixes - mainly whitespace, commas etc.