Minor function and comment changes