Make schema more readable