Mini refactor on formatter, changed bg color