Clean up to use streams api.
Merge pull request #1 from financeCoding/master

More house keeping