linting and updating var names