Reverted, refactored better, and using streams correctly.