Refactored code
merge