fix look-variables and refactor some method-names