Fix issues caught by linting program