Final touches on jshint refactor