removing unused imports
fixing some variable name mismatches