Refactor to improve readability
Refactor to improve readability
Fix tests after refactoring
Fix tests after refactoring
Fix tests after refactoring