Merge pull request #38 from csmith/master

Very minor tidying.
Use forEach where possible.