Removed some unneeded variables and a return