Improve stash formatting