Got rid of un-needed variable declarations.