Minor changes
Merge branch 'style.refactor'