possible code clarity improvements?

[tomholub]

Agree, I like enum solution 👍
I thought on possible improvements here, but decided that this pull request already has many changes and it'll be better to work on inStorage update later.

Originally posted by @sosnovsky in #577 (comment)

If any ideas crossed your mind, we can discuss them here, then file issues separately.