Improve model specs

Avoid inline comments.