Cosmetic improvements

Various improvements to readability, etc. Reduces differences to OpenBSD nvi.