start refactor for passed jshint