PEP 8 clean-up (test commit)
refactor the model module

unstable code
tests are broken