Cleanup imports
PEP8 cleanup
Merge branch 'cleanup' into release/1.2.2
Merge branch 'cleanup' into dev
Merge branch 'release/1.2.2' into dev