Refactor / comments / jshint