made everything neater (much less flake8 warnings/errors)