Some format improve