fix some styling
Merge