Removed commented code
Formatted code
Refactored code