More shenanigans
Cleaned up file according to pylint rules
Latest WIP