Update jshint, fix comment.
Fix if tests that jshint complained about.
Refactor code block into function.
Rename functions and callbacks.