Refine var/func names and output.