cleanup&refactor
integrating djinn, formerly jingo
remove flag & reliance on external package