Typo fixes
PEP8 (+ small code simplification)