Cleanup and use variables