Trimmed

Got rid of all the unneeded things. Should be easier to read the code.