Function declaration and definition orders now match