improve readability and remove (yet) missing test var