Latest schema version
Improve readability of code