made some adjustments to pass linting.
made some adjustments to pass linting.