Cleaned out unused parameters to make code easier to grasp.