Improve code
Upgrade rubycollect4j
Refactor tests