refactor for release on github