Translation comments and little code reorganization