follow-up to !390

What does this PR do?

I've applied all the (very sensible) suggestions that @teidesu proposed in !390 (merged)

It all works, I've tested importing my twitter archive.

Contribution Guidelines By submitting this merge request, you agree to follow our Contribution Guidelines

• I agree to follow this project's Contribution Guidelines
• I have made sure to test this pull request