Rework default format