Incorporate review suggestions

3 jobs for initial-structure in 2 minutes and 29 seconds (queued for 1 second)