Somewhat cleanup formatting