Some style fixes
Merge and fixup styles