If you take the suggestion I added in my comment, it would resolve the issues and remove the duplication.