linting, cleaning up some vars