Replace array access with foreach value

Replace array access with foreach value #38