apply modern syntax when referring to object-collections
simplify code and add if { }
Merge branch 'develop'
push to master