Split into duplicate code instead