Refactor to decrease brittleness.

per https://github.com/SouthArts1/ArtsReady/pull/2