Make style changes and fixes
Fix conflict