Fixing style test failures
Merge branch 'style'