rework storage principles