Fixing a few formatting bugs