Code re structure.