Update model comments and variable naming conventions