Fix tox.ini
Clean up style
Fix Makefile