Code review: used Hash 1.9 syntax where appropriate