cosmetic source code rearrangements