Refactoring of Ganita class