Improve data layout