Mainly PEP8 fixes, some small tweaks, nothing major