I agree. Any suggestions and I'll change it before the PR is closed?