Minor styling
Merging