Praveena | Refactoring and formatting