Remove unused variable and use function to cleanup
Remove function name