Made a few stylistic changes based on some user comments.