cosmetical changes / remove unused variables