FormattingManager refactor