Cleanup formatting which was off