Cleaned up with formatters