Long list of calls -> for loop
Merge pull request #1837 from multikatt/init_cleanup

Long list of calls -> for loop