Renaming functions and ridding them of unused argument.