Removing a few unnecessary lines of code