removed unnecessary variables