Agreed, but sticking with original author's style for public project.