PEP 8 fixes for Andrew