Minor code updates for PEP 8