fixed up style of code in Model classes
fixed merge conflict