Revamped the Formatter system. Simplified and handles entities more elegantly.