This commit replaces some repetitive code with a loop.