cleaned xtend code
refactored tadl formula builder used inside the test