
            Fix variable names and remove linter warnings