Removed unneccesary function arguments