Added several stylistic changes