Cleaning + translation fix (both)