Some style changes
Merge