t# This is a combination of 2 commits.

cleanup main.py
Merge pull request #132 from sn6uv/cleanup_main

cleanup main.py