Removed unnecessary variables and arguments