Improve storage (mostly a lot of formatting)