Some style fixes
Merge