Refactor to improve readability
Refactor to improve readability