Clean code when target change