refactor storage into FixedArray