Rewrote Formatter class