Completed validations and formatting