Implemented Mark's suggestions

Fixed missing break; use CollectionUtils; completed if statement with else