Lint: clean up semicolons, unused vars