Controllers checkstyled. Minor fixes in Model classes