A bit of cleanup for utils.py - also testing commit on new machine :)