Agreed. Couldn't think of anything better at the time. Will likely revisit this section again.