cleaned up storage structure, leaner reads/writes