Style Change Tweak

Rebase master