Refinement and deleted the unused import