removed unused imports and reviewed comments