indentation fixes
express all constraints as a "constraint" element