Whitespace
Rearrange some stuff