Remove unused imports. Make variable naming consistent.