Fix minor checksyle issues in models