PEP8 additions