Updated CheckIndexes to account for schema as well as some formatting changes on both files.