Moved custom fucntions for tokenizing and creating variants into a better...

Moved custom fucntions for tokenizing and creating variants into a better location, made the code style of few modules more cohesive with the rest of the codebase.