cleaned source code; prototype of storage