Removing unnecessary variable declaration from the patch in #7 and adding a n...