Subclass configuration and reduce overhead for accessing

This is what a cleanup looks like…