Code restructure - 2