Made a bunch of stylistic changes requested by damon