removed unnecessary assignments etc.