Use pattern matching instead of cond..do

[RichDom2185]

[RichDom2185]

Also, by using strings instead of atoms, there are less guards against mistakes. See #1174