Improve modules/app.xql readability