Removed inner for/loop not needed