Moved modification after for loop. Fixed ArrayList => List in signatures

Change-Id: I57a72f639ae265533beedd60cd29411e4f30b888
Signed-off-by: Jonas Helming <jhelming@eclipsesource.com>