padding/spacing cleanup, code cleanup/fixes

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