Linting and code cleanup; no functional changes