Made more PEP8-y