We should ultimately use a library for this formatting, but it is a larger, app-wide refactor.