Cleaned up Xively