Ashish | #00 | Refactoring code