Fix not spam translate (Closes #168)
Small refactoring and fixes