More formatting clean up