Fix coding style problems