Final progress, jshint passed