Code restructure - 4