fixed styling
merged