Review variables and admin form

Issue on drupal.org : https://www.drupal.org/node/2289287