Gene tagger - refactoring, some improvements