Slight fixes on coding style

Change-Id: I99c1d948694a10c392704a3b3c5a73d23c90a100