address review comments

1 job for !95 with 57-startup-screens in 4 minutes and 21 seconds (queued for 4 seconds)
latest merge request