Refactored code
.