Bring code into line with style guidelines