refactoring: upgrade to commons collections 4.0