Removed unnecessary arguments from function