Cleanup to resolve jshint complaints.