code cleanup, classify (some) inline styles, uniformize conventions

Signed-off-by: William Rockwood <wrockwood@tadl.org>