Cosmetic
Moved user_choice into it's own method. Changed some names