Refactoring of the manual behaviour tracking