Dino catalog

Please look in to this PR
Indent `when` one step more than `case`.