Slight stylistic changes