Revert "bass-o-mattic: PEP8 and refactor" - needs workThis reverts commit a060265579ee256acc11b01a56ca45641b56116d. (commit: ff98eae)