Fixing a few formatting issues