Validation
Formatting fixes