styling changes
merged