Code style improvements

Change-Id: I273a14da7a02fe08f38f1660c24121660f20bb55