Make linter slap happy
Ongoing cleanup