Khushal: Refactoring of comparative analysis model