Style and removed id getter

Change-Id: I0df82b5d04a0fb526b0c853ba314b11c02d5f69e