Closes #31 - use .each; remove variable