NischayGoyal1 Refactored and removed unwanted code