Fixed models, reworked to better fit PEP8 standards.