Started from scratch
Fixed pep8 violations