Small PEP8 correction, plus added fields in ModelForm definitions