Cleaned up issues caught by linting program