Fixed coding style Warnings