[WIP] PEP8 + Other Fixes