Further style updates
Merge Commit