Refactored Choose Management
Completed Refactoring