embrace inheritance to simplify variable assignment

This simplifies the code a bit and fixes an ordering issue with the concat declaration