modualize storage subroutines.