Fixed coding style problems