removed some unnecessary lines of code