Reworks to take advantage of `let` in specs