#24 reduce codenark import order