Cleanup

Fix examples
Cleanup with pyflakes (no functional changes)