Format docs
Simplify @Id annotation usage