(chore) fix linting issues

Fixes linting issues and removes excess variables.