Cleaned up some formatters.