small refactors on storage helpers, chomp trailing / in store_dir