#Tech[Priyanka] Refactoring and making the gem even more readable