Improve naming
Extract base formatter