Optimize internal structure