clean up and translation fix