Fixing formatting bugs