Make direct edit the style of choice

Plus minor coding style fixes.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>