Fixed spacing.
Rearanging order of functions.