Bug fixes
PEP8 fixes