Code restructured.