Reusing `let`, improved logical grouping and simplified tests.#8

Montana wants to merge 1 commit intomode:mastermode/halogen:masterfrom

Montana:patch-1Montana/halogen:patch-1Copy head branch name to clipboard