Added multiple choice menu and cleaner code