Refactored all formatting into Formatter