Style changes catchup
Merge changes