Adjust structure to reduce wasted space