main.py cleanup