Fix code structure.