Added a few stylistic changes