Code consistency

Change-Id: I3bd275886388d985b74e6ea88c38816d7348c6c5