model review, add comments, clean