Some simple restyling
Merging