cleanup
cleanup
rename refactor for translation call parameters
fixed NPE