Rearrangment/whitespace changes only