Gene tagger: refactoring