rename function and removing unused codes