Update for vivfoundation, PEP 8