cleanup the storage keys and point iteration in the shard's code

http://play.golang.org/p/_l1u361WV2