Remove mutable default argument + minor PEP8 work