Remove function and rename variable