Cleanup spearers a little.
Main cleanup tweaks.
Start adding doc strings so its more obvious what these things do.
Reorder the methods for *Storage, reorder the functions into a single location.