made some adjustments to pass linting.