Just moving functions around