Removed unused commented code. Adjusted formatting. Fixed Validation error.