fixing styling
Merged