some styling
merged