Suggested refactoring

This is my suggested refactoring for using the formatter helpers.