Code restructuring...
Further restructuring...