jingle module refactoring