Made fixes based on linter errors.

3 jobs for stf606-draft (queued for 10 seconds)