Jasmini refactoring