Refactor for ruby 1.9 compatibility