a little cleanup, and add idAttribute to model