Refactored selection of figure