Rename id to be more explicit and remove comment