This cleanup is awesome. Any chance of getting it done for the v3 version as well?