Chore/refactor storageapi

Cosmetic code changes in preparation for refactoring