Fix coding style issues