Code fixes/cleanup after running JSHint