Some formatting clean up