Translated var names into english
Removed TODO: for xml output