Removing forms and doing a little flake8 clean up.