Cleanup and some new translation