Removed unnecessary lines of code.
Minor updates.