Further cosmetic changes

Signed-off-by: Travis Hairfield <twh116@gmail.com>