in par with ripper-tags master refactoring