making the code more consistent.

Change-Id: I0f869426aef3bdec334aaf237b7860008a338c3b