Thanks for the suggestions. Since tests are passing, and this work can be separated out as an independent task, let's revisit this when I am more familiar with what these elements are you want applied and put all the code block changes in separate PR at a later time.