Refactor the workflow modules and generator to be more readable, and to avoid unnecessary job removal.