Refactor image parsing to return a hash

This makes it match observation