some minor rearrangements, nothing to see here, move along