Cleaned up widgets.py