fine tuning #257, code review, jshint