Code cleaning
Merge branch 'contribute-imports' of github.com:adept-dm/adept into contribute-imports