Code smell clean-up
Merge remote branch 'origin/master'
Code smell clean-up