Refactored the code and added some comments