code cleanup, mostly, on aisle 6.

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