refactored code to make it more modular