Flake8 happiness
Implement instruction tagging