removed unused imports and added a final to one variable