reformatted a couple factories, removed some trailing whitespace

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