Improved models PEP8 compatibility.