refactor in the taggable module