Rename _id to id and clean models