Improve formatter ( WIP ) ( reword )