Improve formatter ( WIP )