pep 8 & removed a lot of code
ready to merge
Merge branch 'dev-cleanup' into dev