Ajay | #0000 | Refactoring - Renamed variables and removed commented out code