Aravind | Refactoring.