Fixed a few format problems