Tidy up to main2.py