Duplicate code in library files - potential refactor needed

[FoamyGuy]

The actions failure with details about duplicated sections is here

We want to avoid having duplicated code if possible. One possible way to fix might be to move duplicate code into a shared super class.