Rename function. Minor cleanup.