
        Moved forward with generics checking & refactored the code