Same suggestion as above for making this simpler.