Cosmetic changes - names, empty lines