Fixed a few formatting bugs