refactor for jshint passed
update version