Some codecleanup and I18N