[CLEANUP] Minor argument and comment cleanup