Clean up some code and remove some unnecessarily complexity

I overdid some of the helpers :). Cleaning those up to make sure we have one consistent way to access things like storage from here.