Reword and rename some code
Fix bug when @Column and @Id are set on the same field