Harshit | Small refactoring.