Translator Cleanup

Cleans up some stuff in translator.