Cleanup copy-and-paste design pattern