various cleanup/refactoring, fix titleVariation