WIP refactoring formatter wrapping