#63 improved variable names