stylistic changes
merged