Cleaned up a bit the Utils