Refactored code to make it more modular