Small formatting and minor tomfoolery.