Move functions around