It's not about complicating, it's about readablity.
___
It doesn't look like this was fixed when you force pushed. Encoding errors are still in the current commit.