Could we just use constants.STORAGE_PATH rather than doing this? I noticed that some of the lines in this PR use this, and some of them use constants.STORAGE_PATH. I think for the purposes of the DRY principle, it's a little cleaner to just have everything use constants.