cleaned up vars and request