This is still simplier - even more when running on the device. I'll take note as an improvement though.