cleaned up formatters a bit more