Style/PEP8 additions