Fixed all but one linting error.