Style updates
Mergefix