all cleaned up