Cosmetic changes -- change order of functions.