Cosmetic changes in functions script