Refactor to use Hash#fetch