A bit of formatting clean up