Fix translation bug
Cleanup