Code review and rearchitecture.