Made a bunch of great stylistic changes