Renaming functions and deleting time