Fixed coding standards issues