Cleanup in model files.
Merge branch 'master' of github.com:Nekith/PanKiller