Trimming down excess classes and data member duplication