Rename static factory method
Merge branch 'feature/formatter'