Some more code simplification, PEP8