updating for lint, coverage and style.