Maybe use if - else if instead of when..., it look...

# codereview

[dave08]

Maybe use if - else if instead of when..., it looks too nested for only one option in the when... @elect