Minor cleanup after reading PEP 8