Fix Isssue #23
Revert "Fix 3 CPD violations"

This reverts commit f7cd1c0a70a00695d2f74e589bbf031c4d1c980a.