Improve PEP8.
Improve PEP8.
Improve PEP8.
Fix errors in unit test.