Made a few cosmetic fixes