More formatting clean ups.