Made a lot of cosmetic fixes