Refactored code
Minor code improvement
Refactored code