Code cleaning
Merge branch 'contribute-imports' into logging