Refactored to remove the unused import/class statements.