fix storage style, include order