Refactored selection of variables module
Refactored selection of variables module