Formatted code
Refactored code