I don't think if that it's applicable to this problem.
If you'll going to work on improving this maybe is a good idea to merge it and make another issue for it so we can move on on the rest of the features.