Cleanup to please flake8
Merge branch 'cleanup'

Conflicts:
	printator.py