updated code based on lint feedback

1 job for master in 3 minutes and 49 seconds (queued for 4 seconds)