Java Collections Basics HW - Refactoring