Changed formatter to fit our needs.
Closes #1.