Address code review feedback for system.storage