Minor modifications to functions, variables, constants.