Code tidying
Added your class choices tool