Added Formatter and BasicFormatter
Minor improvements to BasicFormatter