Minor cosmetic changes; finish renaming of function