PEP8ify (where possible)