Changes to conform to new js linting standard