Address Review Comments

26 jobs for !10 with feature/nonexecutive in 142 minutes and 14 seconds (queued for 4 seconds)
merge request