Solved warnings and format issues

Change-Id: I46d5ac687116e3a39b1ca96697e994ef723b1c55