Make format-checking logic clearer - and get correct format name from info hash