Updated various files to remove linting errors.