code cleanup-ish

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