Added to and formatted utils package