A few stylistic changes

As per Ali's suggestions