Cleaned up and reformatted Utils class