Merge "Refactored code to improve readability."