Models cleanup

Models is in pretty good shape, but this gets its coverage up to 100% (81% project-wide) and adds just a touch of pylint cleanup.