Cleaning util.py