Fixed coding style issues

Change-Id: Ie3d0dc8e883d8b3a5125cf68b648b6eec6f9d96b