refacto storage method + perf improvements