Should this be changed to Pep 8?