Clean up default.py and add comments