Formatting changes and validator fixes