Refactoring in favor of more storage-ready behavior