Translated dev nubmers
Minor refactoring