Fixed a few cosmetic errors