! PEP8 fixes
! Merged PEP8 fixes