Make golint happy, replace Id with ID