refactor jogs