More formatting clean ups