trivial
Refactored code for better readability
Refactored code for better readability
Merged