Fixed readability issues with util.c