Fixed classes
More code cleanup
i18n