clean up

cleaned the code and added missing translations in comments