Refactored
PEP8 fixes