refactor to fit github needs.