Cosmetic changes + styling.

Fixed merging garbage
next_tok() is used in util.c