cleaned code and have choice selection working