improve storage analysis grammar