Revert "- use more let() statements instead of local scoping things"

This reverts commit 780cb9bfce84781c033b78090abd1d4feed49349.