Some format cleanup