everything is now (almost) conform pep8

Also did some renaming in the models for less confusion