Minor code tweaks to pass linting