Minor clean up, function tokens convention