Fix/cleanup

https://github.com/jupiter-svm/store/issues/2