#148 Refining custom format