Refs #6, flake8 code cleanup nearly done.