eliminate 2 extraneous variables - #187