Clean up issues caught by linting program