cleaned code and added translation