Got rid of a few unnessary lines of code.