Reformatted declarations and corrected chooser