cleanup + storage doctest