More fixes to coding style