Fixed coding style issues