Tests pass
PEP8 and minor edits