reformatted model structure, the object is not necessary pickleable
Automatic style corrections courtesy of autopep8