Fix issues flagged by Eastwood linter