Cleaned up vars