Use forEach where appropriate