Little clean up in main.py