Fixed some code style warnings

Change-Id: I980096b96061dd22a9eba17ddb635da86c066450