Clean-up formatting