Cleaned up vars.