Display code correctly
let the displayer figure out whether something gets displayed
Simplify finding test-condition and message
Rename test-condition -> condition