PEP 8 and a Bug Fix